From ce821b23f5f719081c6c6db8120408c0158160d5 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 23 Oct 2000 16:15:26 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 6 ++++ ChangeLog.pre-2-0 | 6 ++++ ChangeLog.pre-2-10 | 6 ++++ ChangeLog.pre-2-2 | 6 ++++ ChangeLog.pre-2-4 | 6 ++++ ChangeLog.pre-2-6 | 6 ++++ ChangeLog.pre-2-8 | 6 ++++ .../gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml | 32 +++++++++---------- gtk/gtkwidget.c | 2 +- 9 files changed, 59 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48763ceef0..d0acbc1d5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Oct 23 12:07:57 2000 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_set_style_internal): Fix problem + where font_desc for widget's context lagged widget's font_desc by + one step. + 2000-10-22 Tor Lillqvist * gdk/win32/gdkgc-win32.c diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 48763ceef0..d0acbc1d5b 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Mon Oct 23 12:07:57 2000 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_set_style_internal): Fix problem + where font_desc for widget's context lagged widget's font_desc by + one step. + 2000-10-22 Tor Lillqvist * gdk/win32/gdkgc-win32.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 48763ceef0..d0acbc1d5b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Oct 23 12:07:57 2000 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_set_style_internal): Fix problem + where font_desc for widget's context lagged widget's font_desc by + one step. + 2000-10-22 Tor Lillqvist * gdk/win32/gdkgc-win32.c diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 48763ceef0..d0acbc1d5b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Oct 23 12:07:57 2000 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_set_style_internal): Fix problem + where font_desc for widget's context lagged widget's font_desc by + one step. + 2000-10-22 Tor Lillqvist * gdk/win32/gdkgc-win32.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 48763ceef0..d0acbc1d5b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Oct 23 12:07:57 2000 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_set_style_internal): Fix problem + where font_desc for widget's context lagged widget's font_desc by + one step. + 2000-10-22 Tor Lillqvist * gdk/win32/gdkgc-win32.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 48763ceef0..d0acbc1d5b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Oct 23 12:07:57 2000 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_set_style_internal): Fix problem + where font_desc for widget's context lagged widget's font_desc by + one step. + 2000-10-22 Tor Lillqvist * gdk/win32/gdkgc-win32.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 48763ceef0..d0acbc1d5b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Oct 23 12:07:57 2000 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_set_style_internal): Fix problem + where font_desc for widget's context lagged widget's font_desc by + one step. + 2000-10-22 Tor Lillqvist * gdk/win32/gdkgc-win32.c diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml index 85e68a93fe..456531628e 100644 --- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml @@ -1,7 +1,3 @@ - -Drawables to Pixbufs - - A function of this type can be used to override the default @@ -19,6 +15,10 @@ Drawables to Pixbufs @pixbuf: The pixbuf that is losing its last reference. @data: User closure data. + +Drawables to Pixbufs + + @@ -415,18 +415,18 @@ XlibRGB - - - gdk_image_get(). - - - + + + gdk_image_get(). + + + @@ -515,12 +515,6 @@ Getting parts of a drawable's image data into a pixbuf. - - - - - - This canvas item displays #GdkPixbuf images. It handles full @@ -690,6 +684,12 @@ Getting parts of a drawable's image data into a pixbuf. + + + + + + Xlib Rendering diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index ed19d79e4f..e9a2b31605 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -3302,7 +3302,7 @@ gtk_widget_set_style_internal (GtkWidget *widget, { PangoContext *context = gtk_widget_peek_pango_context (widget); if (context) - pango_context_set_font_description (context, widget->style->font_desc); + pango_context_set_font_description (context, style->font_desc); } if (widget->style != style) -- 2.30.2